projects / project / bcm63xx / u-boot.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: f04776b)
arm, davinci: Use CONFIG_SPL_PAD_TO for padding the SPL in an ais image
authorChristian Riesch <[email protected]>
Wed, 7 May 2014 08:16:28 +0000 (10:16 +0200)
committerTom Rini <[email protected]>
Tue, 13 May 2014 23:43:01 +0000 (19:43 -0400)
The commits

commit b7b5f1a16ca66dfdd817e7339f0e263a5b9f2758
Author: Albert ARIBAUD <[email protected]>
da850evm, da850_am18xxevm: convert to CONFIG_SPL_MAX_FOOTPRINT

and

commit e7497891e34efe5cb2b3a3dc7c6c096c012ede28
Author: Albert ARIBAUD <[email protected]>
cam_enc_4xx: convert to CONFIG_SPL_MAX_FOOTPRINT

replaced CONFIG_SPL_MAX_SIZE by CONFIG_SPL_MAX_FOOTPRINT. However,
CONFIG_SPL_MAX_SIZE is used in the Makefile for padding the SPL
when preparing an u-boot.ais image. By removing CONFIG_SPL_MAX_SIZE
said commits broke the ais image of the da850evm and cam_enc_4xx
configurations.

This patch converts the u-boot.ais target to use CONFIG_SPL_PAD_TO
instead of CONFIG_SPL_MAX_SIZE for padding the SPL and adds
a #define CONFIG_SPL_PAD_TO where it is required.

Signed-off-by: Christian Riesch <[email protected]>
Reported-by: Tom Taylor <[email protected]>
Cc: Sudhakar Rajashekhara <[email protected]>
Cc: Heiko Schocher <[email protected]>
Cc: Albert ARIBAUD <[email protected]>
Makefile patch | blob | history
include/configs/da850evm.h patch | blob | history

diff --git a/Makefile b/Makefile
index 840c39b43b882ad6e7432c9a1940efea87adb159..aad8127d1ccfc7db7128b4b2be1b7b5d0ca9f585 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -890,7 +890,7 @@ MKIMAGEFLAGS_u-boot-spl.ais = -s -n $(if $(CONFIG_AIS_CONFIG_FILE), \
 spl/u-boot-spl.ais: spl/u-boot-spl.bin FORCE
        $(call if_changed,mkimage)
 
-OBJCOPYFLAGS_u-boot.ais = -I binary -O binary --pad-to=$(CONFIG_SPL_MAX_SIZE)
+OBJCOPYFLAGS_u-boot.ais = -I binary -O binary --pad-to=$(CONFIG_SPL_PAD_TO)
 u-boot.ais: spl/u-boot-spl.ais u-boot.img FORCE
        $(call if_changed,pad_cat)
 
diff --git a/include/configs/da850evm.h b/include/configs/da850evm.h
index 860a11dd2b3e43835bc3c43baf469434f3e6a57d..b27940995de8f5e07a39960e3f3f36d98f38315d 100644 (file)
--- a/include/configs/da850evm.h
+++ b/include/configs/da850evm.h
@@ -386,6 +386,7 @@
 #define CONFIG_SPL_STACK       0x8001ff00
 #define CONFIG_SPL_TEXT_BASE   0x80000000
 #define CONFIG_SPL_MAX_FOOTPRINT       32768
+#define CONFIG_SPL_PAD_TO      32768
 #endif
 
 /* Load U-Boot Image From MMC */
Broadcom-s U-Boot